ci: Add prow/ subdirectory with Dockerfile
authorColin Walters <walters@verbum.org>
Wed, 28 Aug 2019 18:59:10 +0000 (18:59 +0000)
committerAtomic Bot <atomic-devel@projectatomic.io>
Thu, 29 Aug 2019 05:43:11 +0000 (05:43 +0000)
I'd like to add OpenShift's prow to this repository.  Let's start
by adding a Dockerfile - it doesn't really do anything besides build.

However...I've lately been thinking about e.g. shipping the ostree tests
as an image, and then e.g. we could test FCOS by running that container
(which would orchestrate the *host's* ostree).

Anyways, not doing that right now but this is a start.

Also this cherry picks the fix from rpm-ostree CI for the sad
Fedora release package brokenness.

Closes: #1906
Approved by: cgwalters

ci/libpaprci/libbuild.sh
ci/prow/Dockerfile [new file with mode: 0644]

index a7c774e78e1c1d06c49eb3fd5b365037f788d530..a8ade0d7ad39f47ca8403497f964d58fdabb4db4 100644 (file)
@@ -35,7 +35,13 @@ pkg_install_if_os() {
 
 pkg_install_buildroot() {
     case "${OS_ID}" in
-        fedora) pkg_install dnf-plugins-core @buildsys-build;;
+        fedora)
+            # https://github.com/projectatomic/rpm-ostree/pull/1889/commits/9ff611758bea22b0ad4892cc16182dd1f7f47e89
+            # https://fedoraproject.org/wiki/Common_F30_bugs#Conflicts_between_fedora-release_packages_when_installing_package_groups
+            if rpm -q fedora-release-container; then
+                yum -y swap fedora-release{-container,}
+            fi
+            pkg_install dnf-plugins-core @buildsys-build;;
         centos) pkg_install yum-utils
                 # Base buildroot, copied from the mock config sadly
                 pkg_install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ \
diff --git a/ci/prow/Dockerfile b/ci/prow/Dockerfile
new file mode 100644 (file)
index 0000000..b1f83c0
--- /dev/null
@@ -0,0 +1,4 @@
+FROM registry.fedoraproject.org/fedora:30
+WORKDIR /src
+COPY . .
+RUN ./ci/build.sh